Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream & Localization #191

Merged
merged 230 commits into from
Jul 4, 2023
Merged

Upstream & Localization #191

merged 230 commits into from
Jul 4, 2023

Conversation

MilenVolf
Copy link
Collaborator

Апстрим и перевод

ElectroJr and others added 30 commits June 23, 2023 13:55
* Update janitor.yml

* Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml

Co-authored-by: Chief-Engineer <[email protected]>

* Update janitor.yml

friction gaming

* tweak cart friction

* Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml

* comment

---------

Co-authored-by: Chief-Engineer <[email protected]>
* QM works for Cap

* Cargo department works for QM
* Hotplate overhaul

- Beakers are now placed on top of the hotplate instead of itemslot.
- Hotplate LED now only lights up if it's heating something.
- More comments/xmldoc.
- Some other minor tweaks.

* Actually remove the beaker slot
@AruMoon AruMoon merged commit 4d00ce4 into Workbench-Team:master-ru Jul 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.